bitkeeper revision 1.1274 (4252b481LlZ-TCB7yUWh6cpv21lxZQ)

Fix canonicalising linear base address in set_segment_base hypercall.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c
index 931addf30bc7c49cb63e25f74b9a3b5c37469db7..7d15496d1ed816253d25c5fe61a4633a743717db 100644 (file)
--- a/xen/arch/x86/x86_64/mm.c
+++ b/xen/arch/x86/x86_64/mm.c
@@ -250,7 +250,7 @@ long do_set_segment_base(unsigned int which, unsigned long base)
     struct exec_domain *ed = current;
 
     /* Canonicalise the base address. */
-    base &= VADDR_MASK;
+    base |= ~VADDR_MASK;
 
     switch ( which )
     {